From 515852ba91af6bd193ac15a2ff0879ddff473b8e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 6 Jul 2001 19:41:00 +0000 Subject: [PATCH] Jul 6 15:38:33 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_class_init): G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to restore some workingness. * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix handle of window type for input-only windows. --- ChangeLog | 9 +++++ ChangeLog.pre-2-0 | 9 +++++ ChangeLog.pre-2-10 | 9 +++++ ChangeLog.pre-2-2 | 9 +++++ ChangeLog.pre-2-4 | 9 +++++ ChangeLog.pre-2-6 | 9 +++++ ChangeLog.pre-2-8 | 9 +++++ gdk/x11/gdkwindow-x11.c | 16 +++++++- gtk/gtkwidget.c | 84 +++++++++++++++++++++-------------------- 9 files changed, 122 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6a3383edc4..c262a97ff1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Fri Jul 6 15:38:33 2001 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_class_init): + G_SIGNAL_TYPE_STATIC_SCOPE GtkSelectionData to + restore some workingness. + + * gdk/x11/gdkwindow-x11.c (gdk_window_new): Fix + handle of window type for input-only windows. + Thu Jul 5 21:53:46 2001 Owen Taylor * gtk/gtkbbox.[ch] gtk/gtkbox.[ch] gtk/gtk[hv]bbox.c: diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 450644e9a4..c94f7a463d 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -366,7 +366,21 @@ gdk_window_new (GdkWindow *parent, private->y = y; impl->width = (attributes->width > 1) ? (attributes->width) : (1); impl->height = (attributes->height > 1) ? (attributes->height) : (1); - private->window_type = attributes->window_type; + + if (attributes->wclass == GDK_INPUT_ONLY) + { + /* Backwards compatiblity - we've always ignored + * attributes->window_type for input-only windows + * before + */ + if (GDK_WINDOW_TYPE (parent) == GDK_WINDOW_ROOT && + GDK_WINDOW_TYPE (parent) == GDK_WINDOW_FOREIGN) + private->window_type = GDK_WINDOW_TEMP; + else + private->window_type = GDK_WINDOW_CHILD; + } + else + private->window_type = attributes->window_type; _gdk_window_init_position (GDK_WINDOW (private)); if (impl->position_info.big) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 77ca31a088..78c25cd377 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -867,27 +867,29 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[SELECTION_RECEIVED] = - gtk_signal_new ("selection_received", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_received), - gtk_marshal_VOID__BOXED_UINT, - GTK_TYPE_NONE, 2, - GTK_TYPE_SELECTION_DATA, - GTK_TYPE_UINT); + g_signal_new ("selection_received", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkWidgetClass, selection_received), + NULL, NULL, + gtk_marshal_VOID__BOXED_UINT, + G_TYPE_NONE, 2, + GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, + G_TYPE_UINT); widget_signals[SELECTION_GET] = - gtk_signal_new ("selection_get", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_get), - gtk_marshal_VOID__BOXED_UINT_UINT, - GTK_TYPE_NONE, 3, - GTK_TYPE_SELECTION_DATA, - GTK_TYPE_UINT, - GTK_TYPE_UINT); + g_signal_new ("selection_get", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkWidgetClass, selection_get), + NULL, NULL, + gtk_marshal_VOID__BOXED_UINT_UINT, + G_TYPE_NONE, 3, + GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, + G_TYPE_UINT, + G_TYPE_UINT); widget_signals[PROXIMITY_IN_EVENT] = g_signal_new ("proximity_in_event", - G_TYPE_FROM_CLASS(object_class), + G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, proximity_in_event), _gtk_boolean_handled_accumulator, NULL, @@ -961,29 +963,31 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_INT, G_TYPE_UINT); widget_signals[DRAG_DATA_GET] = - gtk_signal_new ("drag_data_get", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_get), - gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT, - GTK_TYPE_NONE, 4, - GDK_TYPE_DRAG_CONTEXT, - GTK_TYPE_SELECTION_DATA, - GTK_TYPE_UINT, - GTK_TYPE_UINT); + g_signal_new ("drag_data_get", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get), + NULL, NULL, + gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT, + G_TYPE_NONE, 4, + GDK_TYPE_DRAG_CONTEXT, + GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, + G_TYPE_UINT, + G_TYPE_UINT); widget_signals[DRAG_DATA_RECEIVED] = - gtk_signal_new ("drag_data_received", - GTK_RUN_LAST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received), - gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT, - GTK_TYPE_NONE, 6, - GDK_TYPE_DRAG_CONTEXT, - GTK_TYPE_INT, - GTK_TYPE_INT, - GTK_TYPE_SELECTION_DATA, - GTK_TYPE_UINT, - GTK_TYPE_UINT); + g_signal_new ("drag_data_received", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received), + NULL, NULL, + gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT, + G_TYPE_NONE, 6, + GDK_TYPE_DRAG_CONTEXT, + G_TYPE_INT, + G_TYPE_INT, + GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, + G_TYPE_UINT, + G_TYPE_UINT); widget_signals[VISIBILITY_NOTIFY_EVENT] = g_signal_new ("visibility_notify_event", G_TYPE_FROM_CLASS(object_class), -- 2.30.2